Replace tox with pytest and Makefile, cleanup in docs/Makefile
#669
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ickerday
force-pushed
the
dev/BJ/docs-bugfixes
branch
from
d073d5d to
60df5a0
Compare
Ickerday
changed the title
docs/Makefiletox with pytest and Makefile, cleanup in docs/Makefile
Ickerday
force-pushed
the
dev/BJ/docs-bugfixes
branch
from
fd3310d to
8e99721
Compare
… 'restructuredtext'}`."
Ickerday
force-pushed
the
dev/BJ/docs-bugfixes
branch
from
12c99e8 to
37d5537
Compare
mateusz834
reviewed
Sep 23, 2025
Makefile
Outdated
| @@ -1,56 +1,48 @@ | |||
| RESET_COLOR=\033[0m | |||
| GREEN_COLOR=\033[32;01m | |||
|
|
|||
There was a problem hiding this comment.
nit: remove that newline
| printf "\rWaiting for Splunk for %s seconds..." $$i; \ | ||
| sleep 1; \ | ||
| done | ||
| .PHONY: docker-start |
There was a problem hiding this comment.
nit: add newline before this.
There was a problem hiding this comment.
Can't wait for us finally dropping py3.7, I'll be adding mbake to dev deps so fast lol
Makefile
Outdated
| .PHONY: docker-ensure-up | ||
| docker-ensure-up: | ||
| @for i in `seq 0 180`; do \ | ||
| if docker exec -it $(CONTAINER_NAME) /sbin/checkstate.sh &> /dev/null; then \ |
There was a problem hiding this comment.
This command is really bad and i have been frustrated with it (while using podman), since it does not differentiate between errors returned by docker/shell and checkstate.sh errors.
Suggested change
| if docker exec -it $(CONTAINER_NAME) /sbin/checkstate.sh &> /dev/null; then \ | |
| if docker exec -it $(CONTAINER_NAME) /bin/bash -c "/sbin/checkstate.sh &> /dev/null"; then \ |
This way you at least get an error that docker is not in $PATH and users will act accordingly (edit MakeFile to use podman or just do not use docker-ensure-up, instead of endless waiting).
[mateusz@MPOLIWCZ-M-3NJ6 splunk-sdk-python ]$ make docker-ensure-up
/bin/sh: docker: command not found
Waiting for Splunk for 0 seconds...^[[A/bin/sh: docker: command not found
Waiting for Splunk for 1 seconds.../bin/sh: docker: command not found
Waiting for Splunk for 2 seconds.../bin/sh: docker: command not found
Waiting for Splunk for 3 seconds.../bin/sh: docker: command not found
Waiting for Splunk for 4 seconds.../bin/sh: docker: command not found
Still not ideal, but at least the error is visible.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TODO: Verify I replaced all tox usages with alternatives, update docs
Confusingly
toxis now a psuedo-Makefile, lists project dependencies, runs an almost random assortment of scripts and whatever else. I want to bring order to this chaos.I also want to remove all the commands we don't use in docs' Makefile. Maybe move it to the main Makefile if possible.